projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
608c83e
)
(smerge-start-session): Add interactive spec.
author
Thien-Thi Nguyen
<ttn@gnuvola.org>
Mon, 2 Feb 2009 13:01:06 +0000
(13:01 +0000)
committer
Thien-Thi Nguyen
<ttn@gnuvola.org>
Mon, 2 Feb 2009 13:01:06 +0000
(13:01 +0000)
lisp/smerge-mode.el
patch
|
blob
|
history
diff --git
a/lisp/smerge-mode.el
b/lisp/smerge-mode.el
index 05e0445f76c3033f679b837a1b1305c71561dac1..a942d09c6a09a861122d2b31d99290ff0b91caa8 100644
(file)
--- a/
lisp/smerge-mode.el
+++ b/
lisp/smerge-mode.el
@@
-1222,6
+1222,7
@@
with a \\[universal-argument] prefix, makes up a 3-way conflict."
(defun smerge-start-session ()
"Turn on `smerge-mode' and move point to first conflict marker.
If no conflict maker is found, turn off `smerge-mode'."
+ (interactive)
(smerge-mode 1)
(condition-case nil
(unless (looking-at smerge-begin-re)